-
Notifications
You must be signed in to change notification settings - Fork 1.1k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merge Conflict Resolution (from 7.5.x to 7.6.x) #3493
Conversation
This comment has been minimized.
This comment has been minimized.
fb1ce7e
to
4a4ee4e
Compare
This comment has been minimized.
This comment has been minimized.
4a4ee4e
to
47129ab
Compare
This comment has been minimized.
This comment has been minimized.
4 similar comments
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
1 similar comment
This comment has been minimized.
This comment has been minimized.
a2badd9
to
13d494b
Compare
b996d64
to
7f75e15
Compare
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
i don't understand. why do we have so many changed files?
@akhileshm1 Those are all auto generated files. SonarQube scan was failing because the test report was showing coverage of lines that didn't exist in certain auto generated files because they had not been updated (the files get updated automatically when the code is compiled, but SonarQube is comparing against the code checked into GitHub). |
What is this pull request?
This is an autogenerated pull request by
pint
due to a merge conflict failure seen duringpint merge
.Next Steps
pint merge
NOTE: "Create a merge commit" option must be used to ensure all commits from the head branch is added to the base branch.
Questions?
Please reach out to the Developer Productivity team on Slack at #devprod-eng or #devprod-oncall